ES05: fix comments for javadoc, make MyTrackContainer.remove() simpler
